Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Tue, 30 Aug 2011 22:44:26 +0000 (18:44 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 30 Aug 2011 22:44:26 +0000 (18:44 -0400)

Trivial merge